More gail removal
authorMatthias Clasen <mclasen@redhat.com>
Thu, 27 Dec 2012 06:14:15 +0000 (01:14 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 27 Dec 2012 16:27:46 +0000 (11:27 -0500)
Rename GailMisc to GtkMiscImpl.

gtk/a11y/Makefile.am
gtk/a11y/gailmisc.c [deleted file]
gtk/a11y/gailmisc.h [deleted file]
gtk/a11y/gtkaccessibility.c
gtk/a11y/gtkaccessibilitymisc.c [new file with mode: 0644]
gtk/a11y/gtkaccessibilitymisc.h [new file with mode: 0644]

index e60e340c2dc3581a81ef7a4b4e97ac86cb87745a..54ec17a8cc58787bea756d1d115af46db7e97090 100644 (file)
@@ -5,6 +5,7 @@ noinst_LTLIBRARIES = libgtka11y.la
 gtka11y_c_sources =                    \
        gtkaccessibility.c              \
        gtkaccessibilityutil.c          \
+       gtkaccessibilitymisc.c          \
        gtkarrowaccessible.c            \
        gtkbooleancellaccessible.c      \
        gtkbuttonaccessible.c           \
@@ -49,10 +50,9 @@ gtka11y_c_sources =                  \
        gtktoplevelaccessible.c         \
        gtktreeviewaccessible.c         \
        gtkwidgetaccessible.c           \
-       gtkwindowaccessible.c           \
-       gailmisc.c
+       gtkwindowaccessible.c
 
-gail_private_h_sources =               \
+gtka11y_private_h_sources =            \
        gtkarrowaccessible.h            \
        gtkbooleancellaccessible.h      \
        gtkbuttonaccessible.h           \
@@ -97,16 +97,16 @@ gail_private_h_sources =            \
        gtktreeviewaccessible.h         \
        gtkwidgetaccessible.h           \
        gtkwindowaccessible.h           \
+       gtkaccessibility.h              \
+       gtkaccessibilityutil.h          \
+       gtkaccessibilitymisc.h          \
        gtkcolorswatchaccessible.h      \
        gtkcellaccessibleprivate.h      \
        gtklockbuttonaccessibleprivate.h \
        gtkiconviewaccessibleprivate.h  \
        gtktreeviewaccessibleprivate.h  \
        gtktextviewaccessibleprivate.h  \
-       gtkwidgetaccessibleprivate.h    \
-       gtkaccessibility.h              \
-       gtkaccessibilityutil.h          \
-       gailmisc.h
+       gtkwidgetaccessibleprivate.h
 
 libgtka11y_la_SOURCES =                \
        $(gtka11y_c_sources)            \
diff --git a/gtk/a11y/gailmisc.c b/gtk/a11y/gailmisc.c
deleted file mode 100644 (file)
index 345dc5e..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/* GTK+ - accessibility implementations
- * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-#include "gailmisc.h"
-
-
-G_DEFINE_TYPE (GailMisc, _gail_misc, ATK_TYPE_MISC)
-
-static void
-gail_misc_threads_enter (AtkMisc *misc)
-{
-  gdk_threads_enter ();
-}
-
-static void
-gail_misc_threads_leave (AtkMisc *misc)
-{
-  gdk_threads_leave ();
-}
-
-static void
-_gail_misc_class_init (GailMiscClass *klass)
-{
-  AtkMiscClass *misc_class = ATK_MISC_CLASS (klass);
-
-  misc_class->threads_enter = gail_misc_threads_enter;
-  misc_class->threads_leave = gail_misc_threads_leave;
-}
-
-static void
-_gail_misc_init (GailMisc *misc)
-{
-}
diff --git a/gtk/a11y/gailmisc.h b/gtk/a11y/gailmisc.h
deleted file mode 100644 (file)
index 66d5e9e..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/* GTK+ - accessibility implementations
- * Copyright 2001 Sun Microsystems Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GAIL_MISC_H__
-#define __GAIL_MISC_H__
-
-#include <atk/atk.h>
-
-G_BEGIN_DECLS
-
-#define GAIL_TYPE_MISC                           (_gail_misc_get_type ())
-#define GAIL_MISC(obj)                           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_MISC, GailMisc))
-#define GAIL_MISC_CLASS(klass)                   (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_MISC, GailMiscClass))
-#define GAIL_IS_MISC(obj)                        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_MISC))
-#define GAIL_IS_MISC_CLASS(klass)                (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_MISC))
-#define GAIL_MISC_GET_CLASS(obj)                 (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_MISC, GailMiscClass))
-
-typedef struct _GailMisc      GailMisc;
-typedef struct _GailMiscClass GailMiscClass;
-
-struct _GailMisc
-{
-  AtkMisc parent;
-};
-
-struct _GailMiscClass
-{
-  AtkMiscClass parent_class;
-};
-
-GType _gail_misc_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GAIL_MISC_H__ */
index d5070a650f53a4adb7f52c015238531a0a1d1926..407ffe73fe5ca69e32a4a5ea497cac2da8406e9e 100644 (file)
@@ -19,6 +19,8 @@
 
 #include "gtkaccessibility.h"
 #include "gtkaccessibilityutil.h"
+#include "gtkaccessibilitymisc.h"
+
 #include "gtkwindowaccessible.h"
 
 #include <stdio.h>
@@ -34,7 +36,6 @@
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkcombobox.h>
 #include <gtk/gtkaccessible.h>
-#include "gailmisc.h"
 
 #ifdef GDK_WINDOWING_X11
 #include <atk-bridge.h>
@@ -1014,5 +1015,5 @@ _gtk_accessibility_init (void)
   atk_bridge_adaptor_init (NULL, NULL);
 #endif
 
-  atk_misc_instance = g_object_new (GAIL_TYPE_MISC, NULL);
+  atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
 }
diff --git a/gtk/a11y/gtkaccessibilitymisc.c b/gtk/a11y/gtkaccessibilitymisc.c
new file mode 100644 (file)
index 0000000..86eac06
--- /dev/null
@@ -0,0 +1,50 @@
+/* GTK+ - accessibility implementations
+ * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include "gtkaccessibilitymisc.h"
+
+
+G_DEFINE_TYPE (GtkMiscImpl, _gtk_misc_impl, ATK_TYPE_MISC)
+
+static void
+gtk_misc_impl_threads_enter (AtkMisc *misc)
+{
+  gdk_threads_enter ();
+}
+
+static void
+gtk_misc_impl_threads_leave (AtkMisc *misc)
+{
+  gdk_threads_leave ();
+}
+
+static void
+_gtk_misc_impl_class_init (GtkMiscImplClass *klass)
+{
+  AtkMiscClass *misc_class = ATK_MISC_CLASS (klass);
+
+  misc_class->threads_enter = gtk_misc_impl_threads_enter;
+  misc_class->threads_leave = gtk_misc_impl_threads_leave;
+}
+
+static void
+_gtk_misc_impl_init (GtkMiscImpl *misc)
+{
+}
diff --git a/gtk/a11y/gtkaccessibilitymisc.h b/gtk/a11y/gtkaccessibilitymisc.h
new file mode 100644 (file)
index 0000000..1274bdc
--- /dev/null
@@ -0,0 +1,44 @@
+/* GTK+ - accessibility implementations
+ * Copyright 2001 Sun Microsystems Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_ACCESSIBILITY_MISC_H__
+#define __GTK_ACCESSIBILITY_MISC_H__
+
+#include <atk/atk.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_MISC_IMPL (_gtk_misc_impl_get_type ())
+
+typedef struct _GtkMiscImpl      GtkMiscImpl;
+typedef struct _GtkMiscImplClass GtkMiscImplClass;
+
+struct _GtkMiscImpl
+{
+  AtkMisc parent;
+};
+
+struct _GtkMiscImplClass
+{
+  AtkMiscClass parent_class;
+};
+
+GType _gtk_misc_impl_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GTK_ACCESSIBILITY_MISC_H__ */